feat: add stateless changeset merge and propagation - #43
Merged
Conversation
## Summary - Add dry-run-first merge and propagation commands that rehydrate from live git and GitHub evidence - Verify merged mainline state, exact downstream branch identities, and explicit PR edits before continuing - Cover rebase and cherry-pick propagation from a state-free local bare-remote fixture ## Why - Make Phase 2 resumable from a fresh clone without plan or state files - Keep merge authority explicit and prevent base, source, or upstream force pushes
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
TL;DR
Adds stateless, resumable merge-and-propagate commands for carved changeset chains, with explicit mutation authority and fresh GitHub safety checks before every remote update.
Summary
propagateandmerge-propagatecommands that select an exact PR or changeset index and rehydrate state from git and GitHub rather than local plan/state files.(i of N)titles by explicit PR number, and skip already-completed updates safely.Safety
--no-dry-runand--ack-merge-and-propagate.Validation and review
925affa807c203824127a0fe5e0fb084f14f378d2c82f2ed6c7ca10f1797656938325df18d7e6f96just format: passed; candidate remained unchanged.just test: passed, including 84 carve-changesets tests.git diff --check: passed.skills/prepare-changesets/: zero diff.Authorized lint exception
just lintreaches skill validation and stops only becauseskills/carve-changesets/SKILL.mdis intentionally absent pending the packaging child (#35):This exact limitation is authorized for #33; all preceding lint checks pass. No other lint failure is waived.
Tickets
Fixes #33